Squashed commit of the following:

commit 9c95d6a0b10d2e40cb5003934ccc98af6330dfcb
Author: JuannyWang <hongjwan@cisco.com>
Date:   Thu Jun 19 10:43:15 2014 +0800

    [delay skip] delay skip to relieve bitrate burst somehow
Merge pull request #983 from JuannyWang/delay_skip

 [delay skip] delay skip to relieve bitrate burst somehow
Merge remote-tracking branch 'upstream/master' into travis.osx