Fix Issue 1288.
Merge remote-tracking branch 'remotes/upstream/master'