yg changed by 20141208
Merge branch 'release/v1.02'