Merge branch 'master' into stringent_null_move