update to 4.1.2
Merge remote-tracking branch 'upstream/master'