Prepped 5.0.2 release
Merge branch 'master' into 5.0-stable
Merge branch 'master' into 5.0-stable
Fix changelog entries