Merge branch '11341-arvput-resume-error'
authorLucas Di Pentima <lucas@curoverse.com>
Wed, 12 Apr 2017 18:37:03 +0000 (15:37 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Wed, 12 Apr 2017 18:37:03 +0000 (15:37 -0300)
Closes #11341


Trivial merge