Merge remote-tracking branch 'origin/master' into mark_folder_as