merge 3136 to master 2.5
Merge pull request #3260 from dotCMS/merge-3136-to-2.5

merge 3136 to master 2.5