Following changes in esolid-base
Merge branch 'master' of https://github.com/nradulovic/esolid-eds