Merge branch 'master' into 3609-arv-run
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Oct 2014 19:35:53 +0000 (15:35 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 16 Oct 2014 19:35:53 +0000 (15:35 -0400)

Trivial merge