Fix passing epilog to incompat python versions. Update specs, add tests. etc...
Fix merge conflict when pulling devel into master