10111: Merge branch 'master' into 10111-collection-labels
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 16 May 2017 14:32:11 +0000 (11:32 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 16 May 2017 14:32:11 +0000 (11:32 -0300)

Trivial merge