All the rest of today's changes
Merge remote-tracking branch 'origin/master'