Merge branch 'master' into terencehill/overkill_stuff
authorterencehill <piuntn@gmail.com>
Mon, 26 Sep 2016 15:04:42 +0000 (17:04 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 26 Sep 2016 15:04:42 +0000 (17:04 +0200)

Trivial merge