Integration

Hi Pascal,

IDK, what is going on here but can you please cherry pick the commits listed below?  After that I'm going to wipe out my fork and start fresh.  This has just gotten crazy.

Thank you,

Johnny

April 9 00153bb
April 16 ebb0d81
May 1 c4354ef
July 9 998c955