Merge "Revert .htaccess permissions back to 0644"