Merge branch 'master' into 6702-gce-node-create-fix
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 2 Feb 2016 15:56:13 +0000 (10:56 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 2 Feb 2016 15:56:13 +0000 (10:56 -0500)

Trivial merge