xx
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from Stumble/master

xxxx