Update/fix Navicat Data Modeler
Merge pull request #3193 from alebcay/navicat-data-modeler

Update/fix Navicat Data Modeler