Merge pull request #846 from nupplaphil/features/6948-bot_detection