Linebreaks in URLs
Merge branch 'urilinebreaks' into master2

Conflicts:
	test/test_parser.rb