Fixes php5-fcgi timeout's.
Merge branch 'travis-test' of github.com:nickschuch/drupal into travis-test