Merge branch 'master' into '5-use-good-params-everywhere'

# Conflicts:
#   BotCore.php
4 jobs for 5-use-good-params-everywhere in 1 minute and 9 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Lint
passed #1465
lint:lint-php5.4

00:00:38

passed #1466
lint:lint-php5.6

00:00:39

passed #1467
lint:lint-php7.0

00:00:37

 
  Codesniffer
passed #1468
codesniffer

00:00:29