Update master to 1.3.6