Merge branch 'master' into terencehill/hud_fixes
authorterencehill <piuntn@gmail.com>
Thu, 30 Jan 2014 00:59:07 +0000 (01:59 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 30 Jan 2014 00:59:07 +0000 (01:59 +0100)

Trivial merge