Merge branch '11684-unsigned-locator-fix'
authorLucas Di Pentima <lucas@curoverse.com>
Tue, 30 May 2017 21:24:23 +0000 (18:24 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Tue, 30 May 2017 21:24:23 +0000 (18:24 -0300)
Closes #11684


Trivial merge