Changes made by Jonathan Winterbourn after update (jonwinterbourn@googlemail.com).