Fix #986
Merge remote-tracking branch 'official/master'