fixed travis-ci testing (missing php-cgi in PHP 5.3.27)
Merge remote-tracking branch 'origin/develop' into develop