Update master to use 4.1 release and allow 4.2 testing.