ROL-1983 port of Greg's trunk commit to 5.0 branch.

git-svn-id: https://svn.apache.org/repos/asf/roller/branches/roller_5.0@1557922 13f79535-47bb-0310-9956-ffa450edef68