Merge "Control property names in doxygen now match code" into devel/master