11557: Merge branch 'master' into 11557-acr-output-col-perms
authorLucas Di Pentima <lucas@curoverse.com>
Wed, 7 Jun 2017 13:45:53 +0000 (10:45 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Wed, 7 Jun 2017 13:47:32 +0000 (10:47 -0300)

Trivial merge