Rollback to Ivan's changes that I clobbered
Merge branch 'master' of https://github.com/MAECProject/python-maec