Pending the ok from wichert and ggozad I check this in so that it can be
reviewed and I can build my bundle :)