Merge branch 'master' into 'user-editcount'

# Conflicts:
#   BotCore.php
#   Debug.php
4 jobs for user-editcount in 1 minute and 21 seconds
Status Job ID Name Coverage
  Lint
passed #1473
lint:lint-php5.4

00:00:51

passed #1474
lint:lint-php5.6

00:00:50

passed #1475
lint:lint-php7.0

00:00:45

 
  Codesniffer
passed #1476
codesniffer

00:00:30