Merge branch 'master' into 6507-node-manager-azure
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 28 Aug 2015 14:44:32 +0000 (10:44 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 28 Aug 2015 14:44:32 +0000 (10:44 -0400)

Trivial merge