One last time. I know. This actually works.
Merge branch 'master' into subdir-deploy
Merge branch 'subdir-deploy'