Merge branch 'master' into next

diff --cc .travis.yml
index d0f43b3235ce035b0d59e3d6ac582dcc0dc5d2a5,56a77f52ea939427ef265972e374a68271940cb3..87ce43b8b9a323154c61bdec312fea55e09fb82d
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -1,7 -1,8 +1,8 @@@
  language: php
+ sudo: false
  php:
    - 5.6
 -  - 5.3
 +  - 5.5
  before_install:
    - pyrus install pear/PHP_CodeSniffer
    - phpenv rehash