Merge from deanydean/bot-core head