Merge remote-tracking branch 'origin/master' into UrlImprovements
Fixed xmldoc comment
Improved unit tests