stu - I am about to push the release to CR. Your last patch is included - but it caused a timout on jenkins and it looks like the Travis run for your pull requests maybe also timed out.