Merge branch 'ocombe-logsnippet'