Richard

@tsamb can you please CR this and merge if you think it works?