Updates sol006 branch with master

No match.