Merge branch 'master' into terencehill/modified_default_cvars 299/head
authorterencehill <piuntn@gmail.com>
Sun, 3 Apr 2016 12:22:12 +0000 (14:22 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 3 Apr 2016 12:22:12 +0000 (14:22 +0200)

Trivial merge