Merge branch 'master' of https://github.com/juju/juju into login-environ-user-only