Merge branch 'JP'
Merge branch 'JP'
Merge branch 'JP'
Merge branch 'master' into Sina
Merge branch 'Sina' of https://github.com/jp90/src into Sina