draft
Merge branch 'master' of https://github.com/hydroshare/hs_core

draft