0.3.1: Updating to run with 4.1.1-SNAPSHOT