Fixed an issue in the HeartBeater that could cause the creation of big log files
Merge branch 'master' into new_romie