Committer: qian.li@emc.com
Merge remote-tracking branch 'ffof/master'