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