Removed .htaccess from MANIFEST
Merge remote-tracking branch 'origin/lean'