Merge branch 'master' into terencehill/ca_bots_fix
authorterencehill <piuntn@gmail.com>
Fri, 11 Nov 2016 18:14:55 +0000 (19:14 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 11 Nov 2016 18:14:55 +0000 (19:14 +0100)
commitdf6524e32dea9e91c2c4ba6ff383eef5d20ffcdb
tree9d26d515f0ea6569ad1ef662a1d16052da1d2718
parentcc2034216bcc410f5f6b322adb524fff0a14aa22
parentbe46fa6ed304ecb1265ccf2c42f0eb7789b529dc
Merge branch 'master' into terencehill/ca_bots_fix