Bugfixes
Merge branch 'dev' of https://github.com/JHUISI/charm into dev
Merge branch 'dev' into 2.7-dev