Merge remote-tracking branch 'origin/master'

Restore all of the comments.