Old changes for some reason.
Merge branch 'devel' of github.com:bsmithyman/pygeo into devel