Merge branch 'PHP-5.6'

* PHP-5.6:
  oops, forgot sudo for make install

diff --cc travis/compile.sh
index 3603c9b0a8a2430066b5002f71a5fce00f5ddeb2,3a381a88850cf35ab037f94ca754fb0d16aeac78..77ff49ab15ee418c78a2f424c0df2bd3cbb0ec6f
--- 1/travis/compile.sh
--- 2/travis/compile.sh
+++ b/travis/compile.sh
@@@ -53,14 -52,10 +53,14 @@@ $TS 
  --enable-calendar \
  --enable-ftp \
  --with-pspell=/usr \
 ---with-recode=/usr \
  --with-enchant=/usr \
  --enable-wddx \
 +--with-imap \
 +--with-imap-ssl \
 +--with-freetype-dir=/usr \
 +--with-t1lib=/usr \
 +--with-xpm-dir=/usr \
 +--with-kerberos \
  --enable-sysvmsg 
  make -j2 --quiet
- make install
+ sudo make install