Merge branch 'master' into gh-pages
Merge commit 'd911807b3c71328fbe31fcb67490a1869e48c9d9'