improved error message
Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version