Bring slightly up-to-date
Merge remote-tracking branch 'origin'