9701: Merge branch 'master' into 9701-collection-pack-small-files-alt
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 11 Oct 2016 17:54:14 +0000 (14:54 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 11 Oct 2016 17:54:14 +0000 (14:54 -0300)

Trivial merge