Merge branch 'master' into terencehill/hud_code_cleanup
authorterencehill <piuntn@gmail.com>
Mon, 6 Jan 2014 00:53:05 +0000 (01:53 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 6 Jan 2014 00:53:05 +0000 (01:53 +0100)

Trivial merge