Merge branch '5737-fix-broken-test-with-231'
authorLucas Di Pentima <lucas@curoverse.com>
Fri, 2 Dec 2016 18:48:40 +0000 (15:48 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Fri, 2 Dec 2016 18:48:40 +0000 (15:48 -0300)
refs #5737


Trivial merge