Commented out php 5.5
Merge branch 'master' into travis