Merge pull request #2145 from vlakoff/develop

URI->_remove_url_suffix() : suffix has to be at the end of uri_string