Merge branch 'master' into terencehill/bot_item_rating
authorterencehill <piuntn@gmail.com>
Fri, 20 Jan 2017 15:50:01 +0000 (16:50 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 20 Jan 2017 15:50:01 +0000 (16:50 +0100)

Trivial merge