Merge branch 'master' into mono4-continuations_fix