Merge branch 'master' into ag/apache