MRG: Merge branch 'master' into maint_move-ci-dir
MRG: Merge branch 'master' into maint_move-ci-dir

scottclowe/python-continuous-integration,scottclowe/python-ci,scottclowe/python-ci,scottclowe/python-continuous-integration