This is sync with Linus' tree to receive KEY_IMAGES definition that went in through input tree.
Attach a file by drag & drop or click to upload
