Update to 1.5-SNAPSHOT