Merges master branch again into sol006