Merge branch 'release-1.2' into develop
add
add bug.php
test track
Merge branch 'develop'
Merge branch 'bug1'