Testing again working
Auto-merging 7f949d9e316e35240cbe4b5bab317f0353237f4e

Travis: Passed at 2014-07-04T11:38:38Z
https://travis-ci.org/vhbit/bot-test/builds/29135723