Whoops - tried to merge to wrong branch for bug #60 merge. This redos