compeak Merge branch 'richard67-patch-1' into develop