#6757
#45
#45
#45
Merge pull request #52 from dotCMS/issue-45-backport-issue-6757-from-3.0.1

Issue 45 backport issue 6757 from 3.0.1