Merge branch 'master-github'