Remove Heartbleed popup
Merge branch 'develop'