Merge from trunk

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