Get rid of Partner, no need
Merge branch 'master' into gh-pages