Merged in ISIS-537

[Dan Haywood]

Jeroen, Martin...

just to say that I've merged in the ISIS-537-use-bootstrap branch, is now
in master (for 1.8.0-SNAPSHOT).

Cheers
Dan