upgrade to 1.6-SNAPSHOT