Merge branch 'dev' of ssh://git.code.sf.net/p/allura/git