Fix bootstraping broken in #142
Merge pull request #145 from kirelagin/fix_root

Fix bootstraping broken in #142
Merge remote-tracking branch 'holman/master' into syntax

Conflicts:
	script/bootstrap