fixes #1371
fixes #1371
Merge branch 'master-2.2.1' of github.com:dotCMS/dotCMS into master-2.2.1