Comment out potentially breaking htaccess lines.
Merge remote-tracking branch 'origin/master'