Better location handling (bugfix for junibreh)
Better location handling (bugfix for broken links)
Merge remote-tracking branch 'upstream/master'