Merge branch 'master', remote-tracking branch 'github/master'