Merge remote-tracking branch 'origin/master' into pete-fixes
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 26 Jun 2014 17:51:58 +0000 (13:51 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 26 Jun 2014 17:51:58 +0000 (13:51 -0400)

Trivial merge