Merge pull request #3067 from obrignoni/2.3/develop

2.3/dev Field mapping, plugin field type methods, updated method names and a bunch of improvements
Fix typo