make sure /var/www/html dir exists
Merge branch 'master' into release