Merge with laster guice. Guice commit : 0604fc7487cd2108d6c29643c578bdece8f27df3