Merge pull request #245 from kblees/kb/master/fix-libsvn-address-conflict