Updating to vanilla 1.5.0