Sync the changes from edx-dl.py