Lingering updates to hotfix-v0.2.6
Merge branch 'hotfix-v0.2.6' of https://github.com/wmoore28/epics into hotfix-v0.2.6
Merge branch 'hotfix-v0.2.6' of https://github.com/wmoore28/epics into hotfix-v0.2.7