release 1.10
Merge remote-tracking branch 'upstream/master'