Dudes need better error messages
Merge branch 'feature/master-1' of git.icinga.org:icingaweb2 into feature/master-1