Fix #883
Merge remote-tracking branch 'origin/master'