Allow .htaccess configuration
Merge branch 'master' into introduction_package