Merge remote-tracking branch 'upstream/master'
extra options for skipping tests
Merge remote-tracking branch 'origin/master'
Merging Alex's latest changes.