11684: Merge branch 'master' into 11684-unsigned-locator-fix
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 30 May 2017 17:07:41 +0000 (14:07 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 30 May 2017 17:07:41 +0000 (14:07 -0300)

Trivial merge