Merged from codership-mysql/5.5 changes revisions 3743-3756
Attach a file by drag & drop or click to upload
