Merge branch 'GitHub/master'