A more difficult test lesson.
Merge remote-tracking branch 'origin/master'