Merge branch 'master' into terencehill/misc_hud_fixes
authorterencehill <piuntn@gmail.com>
Sat, 9 Jul 2016 17:28:29 +0000 (19:28 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 9 Jul 2016 17:28:29 +0000 (19:28 +0200)

Trivial merge