Merge branch '11502-unstripped-manifest-fix'
authorLucas Di Pentima <lucas@curoverse.com>
Wed, 19 Apr 2017 20:42:26 +0000 (17:42 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Wed, 19 Apr 2017 20:42:26 +0000 (17:42 -0300)
Closes #11502, #11511


Trivial merge