unupdate external.py
Merge branches 'master' and 'resolve'
Revert "merge dev"

This reverts commit 6bd01d9851a2d07cc7d1fa100baa9a5565d0feac, reversing
changes made to dfdc7bce6d2c6a8baf1cd688e948bd8a832b4584.

"revert"