Upgrade to g-d-m 3.1.1, also make it a managed dependency