corrected invalid merge
corrected invalid merge
Merge branch 'akoepsel/devel-0.5/testing' into akoepsel/devel-0.5/pbb