10037: Merge branch 'master' into 10037-useless-progress-bar
authorLucas Di Pentima <lucas@curoverse.com>
Thu, 22 Sep 2016 17:01:40 +0000 (14:01 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Thu, 22 Sep 2016 17:01:40 +0000 (14:01 -0300)

Trivial merge