Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of github.com:katco-/juju into local-apt-defaults