juju/juju — pull request #611 by ericsnowcurrently (2014-08-26 23:46:42+00:00)
Title: Un-revert PR #530

This reverts commit 68c71ec48f16eac6f8aff2a66496afb148ec95c6.