Merge remote-tracking branch 'github/master' into master-apache