11121: Merge branch 'master' into 11121-crunch-output-collection-owner
authorLucas Di Pentima <lucas@curoverse.com>
Fri, 17 Feb 2017 22:17:40 +0000 (19:17 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Fri, 17 Feb 2017 22:17:40 +0000 (19:17 -0300)

Trivial merge