11557: Merge branch 'master' into 11557-acr-output-col-perms
authorLucas Di Pentima <lucas@curoverse.com>
Fri, 16 Jun 2017 16:34:13 +0000 (13:34 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Fri, 16 Jun 2017 16:34:13 +0000 (13:34 -0300)

Trivial merge