Merge remote-tracking branch 'upstream/master' into for-pull-request
checksum change without version up
merge
checksum change
Merge pull request #3064 from camlspotter/for-pull-request

Checksum change without version ups