Merge branch 'ib/7841' of https://git-wip-us.apache.org/repos/asf/allura into ib/7841