Increasing idle timeout to 90 seconds.
Merge remote-tracking branch 'origin/master'