Merge branch 'master' into terencehill/bot_AI
authorterencehill <piuntn@gmail.com>
Wed, 11 Jan 2017 15:05:06 +0000 (16:05 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 11 Jan 2017 15:05:06 +0000 (16:05 +0100)

Trivial merge