Merge parser changes from master

- Randomize URL reference tokens
- URI aliases follow URL schemes