- Merged m_properties and m_methods in Type
Merge remote-tracking branch 'origin/master' into heuripedes-master