Update master to 1.11.4 release