Merging paths that diverged on GitHub
Merge branch 'master' into develop