Merge pull request from dotCMS/master

Merge pull request from dotCMS/master