Merge branch 'github_2_1' into rel_2_1