Merge branch 'master', remote-tracking branch 'origin'
Rebuild per PR from @jgehrcke