Merge branch '984-ai-improvements'
authorJessica Tallon <jessica@megworld.co.uk>
Tue, 21 Oct 2014 10:57:15 +0000 (11:57 +0100)
committerJessica Tallon <jessica@megworld.co.uk>
Tue, 21 Oct 2014 10:57:15 +0000 (11:57 +0100)

Trivial merge