Merge branch 'chai'
chaibin20140216