Bugfix to make Builddeps
Merge remote-tracking branch 'johannes/develop' into savebranch