Merge branch 'master' of https://github.com/juju/juju into share-env-take2