merge plupload 1.5.7