Merge branch 'master' into 4904-arv-web
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 12 Feb 2015 18:52:48 +0000 (13:52 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 12 Feb 2015 18:52:48 +0000 (13:52 -0500)

Trivial merge