Copy & Paste in same Folder Fix

#739
Merge branch '2.x' into 2.1_n