Merge pull request #4597 from TeamAmaze/imgbot