11502: Merge branch 'master' into 11502-unstripped-manifest-fix
authorLucas Di Pentima <lucas@curoverse.com>
Wed, 19 Apr 2017 19:38:30 +0000 (16:38 -0300)
committerLucas Di Pentima <lucas@curoverse.com>
Wed, 19 Apr 2017 19:38:30 +0000 (16:38 -0300)

Trivial merge