Merge branch 'DefaultUser/waypoint_icons'
authorMario <mario@smbclan.net>
Sun, 11 Feb 2018 00:45:20 +0000 (10:45 +1000)
committerMario <mario@smbclan.net>
Sun, 11 Feb 2018 00:45:20 +0000 (10:45 +1000)

Trivial merge