Merge branch 'master' into terencehill/unlimited_ammo_fixes
authorterencehill <piuntn@gmail.com>
Wed, 15 Apr 2015 22:47:56 +0000 (00:47 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 15 Apr 2015 22:47:56 +0000 (00:47 +0200)

Trivial merge