Merge pull request from dotCMS/master