Update in line with 0.9.4 changes