This was sent too late to actually make it for v6.6 but was sent against v6.6 so merge it up here.
Attach a file by drag & drop or click to upload
