fix error with empty folder uploading on Google Chrome
Merge branch '2.x_n' into 2.1_n