Merge branch '5285-arpi-use-settings' closes #5285
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Mar 2015 15:12:31 +0000 (11:12 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Mar 2015 15:12:31 +0000 (11:12 -0400)

Trivial merge