Merge origin/master 2014.4.15 9:54  hxm modify fresh-channel.gsp