Update bootstrap instructions, ref #1515.
Merge remote-tracking branch 'upstream/master'