Merge commit 'cc6e18f'

Conflicts:
	Uri.min.js
	spec/Uri.spec.js