Merge branch 'master' into 7370-package-install-testing
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 15 Oct 2015 14:40:17 +0000 (10:40 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 15 Oct 2015 14:40:17 +0000 (10:40 -0400)

Trivial merge