Merge branch 'master' into adding-pictures-branch