Correct permissions for www-data user
Merge remote-tracking branch 'origin/master'