Merge branch 'master' into bug_245_record_playback_fixes