Fix 1385534 using fix from MikeT.  Convert to patch format, and update colorbox to latest version.