Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -79,7 +79,7 @@ script:
   - if [ -z "$qaExtended" ]; then make ci; fi;
   - if [ "$qaExtended" = "true" ]; then make ci-extended; fi;
   - php benchmark/memory.php
-  - php example/error/error.php
+  - php examples/error/error.php
 
 ## Gather coverage and set it to coverage servers
 after_script: if [ "$qaExtended" = "true" ]; then make ci-coverage; fi;