Properly remove backup folder
Encode folder returned from downloader. fix #2071
Merge remote-tracking branch 'upstream/develop' into develop