juju/juju — pull request #1159 by mjs (2014-11-16 22:45:35+00:00)
Title: Backport the fix for LP #1382751 to 1.20

See https://bugs.launchpad.net/juju-core/+bug/1382751. The PR for 1.22 is #1075.