3900: Merge branch 'master' into 3900-trash-collections-delete-api
authorLucas Di Pentima <lucas@curoverse.com>
Fri, 10 Feb 2017 18:04:41 +0000 (15:04 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Fri, 10 Feb 2017 18:04:41 +0000 (15:04 -0300)

Trivial merge