Use new PropertyDefinition API in CpdPlugin
Merge remote-tracking branch 'origin/master'