Merge branch 'updates'
ignore cached .htaccess
Merge branch 'master' into updates