Merge branch 'patch-1' of github.com:Dieterbe/heka into dieterbe-doc-tweaks
Merge branch 'dev' of github.com:Dieterbe/heka into dieterbe-doc-tweaks
Merge branch 'dieterbe-doc-tweaks' into dev