Remove C++-style comment.

Shame on you, Richard.
Fix bug in urlDirname that prevents disk writeout.

Thanks to David Bonnes.
Update CHANGES.
Merge remote-tracking branch 'upstream/master'