'bootstrap' has special meaning to XSLoader

it will cause problems once we start to add in xs code
Merge branch 'master' into xs

Conflicts:
	lib/mop.pm