Merge branch 'beacons+viech' of https://github.com/Unvanquished/Unvanquished into beacons