Merge branch 'master' into 'MasterBugFixing'
Merge branch 'MasterBugFixing' into 'master'