SA-CORE-2014-003 combined patch for 6.32

Created this via diffing the core tags:

git diff 6.31..6.32 | git apply --index