Merges branch sol006 into master

No match.