Fixes #3169 - security update
Merge pull request #3171 from aaronschachter/core

Critical Dries update
First easiest implementation.