Merge request

Hi Nicolas, this is really just to sync our repositories together; I haven't made any changes of real significance, but I did streamline the Uri class a little bit.

Dale