Adjust URL one more to use one that should work best for all cases
Add slightly more output when parsing results
Merge remote-tracking branch 'upstream/master'