Merge branch 'current_master' into courselecture