update to 1.12
Merge remote-tracking branch 'origin/master'