Increased the FCGI timeout to make long running debugging easier.
Merge remote-tracking branch 'origin/master'