Merged in branch 2014-01_EnumSupport.
Authored by: toaomalkster 2014-02-05
Parent: [r852]
Child: [r854]