Merge branch 'pete-fixes' closes #3096
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 27 Jun 2014 12:47:59 +0000 (08:47 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 27 Jun 2014 12:47:59 +0000 (08:47 -0400)

Trivial merge