Fix issue where no general updates results in an empty email
Merge branch 'develop' into release_branches/1.0.4