[BACKLOG-1445] Fix bad merge
Merge branch 'master' of https://github.com/pentaho/modeler
Merge pull request #81 from bennychow/master

Fix bad merge