Merge pull request #12411 from eileenmcnaughton/matt_opt
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 4 Jul 2018 07:52:01 +0000 (19:52 +1200)
committerGitHub <noreply@github.com>
Wed, 4 Jul 2018 07:52:01 +0000 (19:52 +1200)
Fix sample custom data is_reserved=0


Trivial merge