Merge branch 'master' of https://github.com/jackeer/QA_12

Signed-off-by: jackeer <jackeer@hotmail.com>
Merge branch 'master' of https://github.com/jackeer/QA_12