Merge in upstream stuff.

Merged in some upstream stuff.  Cookbook is now 4.1.1.