Merge branch '9118-arv-put-nameerror-fix-wip'
authorBrett Smith <brett@curoverse.com>
Tue, 3 May 2016 19:22:00 +0000 (15:22 -0400)
committerBrett Smith <brett@curoverse.com>
Tue, 3 May 2016 19:22:00 +0000 (15:22 -0400)
Closes #9118, #9127.


Trivial merge