Fix stray 'else' in bootstrap script.
Merge branch 'next' into can-loopback