Changes from upstream incorporated locally
Merge branch 'development' of github.com:jniles/bhima into development