Merge branch '2752-arv-put-resume'
authorBrett Smith <brett@curoverse.com>
Fri, 30 May 2014 14:45:02 +0000 (10:45 -0400)
committerBrett Smith <brett@curoverse.com>
Fri, 30 May 2014 14:45:40 +0000 (10:45 -0400)
Closes #2752, #2864.


Trivial merge