Merge branch 'hotfix-1.0.1'
Merge branch 'develop'
Disable trimming of rotator content.
Merge branch 'hotfix-1.0.2' into develop