Merge branch 'bugfix/gopher-empty-lines' into 'develop'