Fixed ka.ContenTypes.Plugin
Merge remote-tracking branch 'origin/propel1.6' into propel1.6