Merge branch 'master' into peternewman-hidden-subdir