merged quickstart changes
Merge remote-tracking branch 'upstream/master' into quick-start