Changes for 0.15.0