Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
Merge branch '2.x' into 2.x_n
fix problem of DnD, clipboard uploading with Google Chrome
Merge branch '2.x_n' into 2.1_n