#32 - Upgrade Wagon from 2.4  to 2.5 (to pull in fix for WAGON-381)