Changes for 0.13.1-M1