201412_for_yg3
Merge branch 'release/v1.04'