Merge remote-tracking branch 'upstream/master'
[general] Merge Forg.interval and Fog.timeout into a single file.
Merge branch 'master' into softlayer