Merge branch 'master' of ssh://mire.hcoop.net/home/mwolson_admin/hcoop-git/misc