Merge branch 'master' into terencehill/hud_shake_fix
authorterencehill <piuntn@gmail.com>
Tue, 14 Jun 2016 18:15:35 +0000 (20:15 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 14 Jun 2016 18:15:35 +0000 (20:15 +0200)

Trivial merge