Update to include URLScanner ref.
Merge origin/master