Oops removing some accident cut/paste
Merge branch 'master' into issue171