Pull request from upstrean
Merge remote-tracking branch 'upstream/master'