support old-style moves location uris
Merge remote-tracking branch 'origin/master'