Merge branch 'master', remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/release-1.1.2'
Merge remote-tracking branch 'origin/master'
modify IMX6Factory