Merge branch '42cc_4254' of ssh://git.code.sf.net/p/allura/git into 42cc_4254