NDB `choices` order not preserved

[hamx0r]

If my NDB model has a Property like
ndb.StringProperty(verbose_name='type', required=True, choices=['Essay', 'Podcast', 'Video']),
and I then I expect the resulting form select to have options in the same order. However, they seem to be randomized.

This issue seems resolved in the master branch, so hoping it can be formally released. Until then, thanks for the fix in master!