Fix #1415
Merge branch 'master' of git://github.com/flavour/eden
Extra Shapefile Layer for DRMP, fixup inv-mngt prepop for new name for
CVTL