Switched to 2.5.0-SNAPSHOT on master