Updates for v1.1.1 merge in.