Merged #219 "Update to Guice 4.0-beta5"