we don't copy .htaccess to _site
Merge branch 'master' into release