bugfix
Merge remote-tracking branch 'origin/master_fixes' into version_history_fix