(re #206) Move the space name to beginning of second line
Merge remote-tracking branch 'origin/bootstrap' into bootstrap