Merge branch '2.0'

diff --cc .travis.yml
index 74da2f74da0f6d75a22473182bd4defb41de24ed,c631ee378a5b4eb0cfa413de680b5265177b2948..56a77f52ea939427ef265972e374a68271940cb3
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -1,9 -1,10 +1,10 @@@
  language: php
+ sudo: false
  php:
 -  - 5.4
 +  - 5.6
    - 5.3
  before_install:
 -  - pear install pear/PHP_CodeSniffer
 +  - pyrus install pear/PHP_CodeSniffer
    - phpenv rehash
  before_script:
    - git clone --branch=master --depth=1 --quiet git://github.com/WoltLab/WCF.git WCF