Don't set any options when generating the .htaccess file (causes problems with some web hosting companies).
Merge remote-tracking branch 'template/master'