Updates branch sol006 with master

No match.