Fix bug where web locations wouldn't be displayed
Merge branch 'devel'