Improve formatting of error messages
Do not make dummypython fail
Merge remote-tracking branch 'origin/master' into manjaro