Really include fixes from Sunil.  Not sure what when wrong with git am the first time.