MFH: r369563 (without @dir changes)

- Update to 2.1.1

Security:	CVE-2014-2905
Security:	CVE-2014-2906
Security:	CVE-2014-3856
Security:	CVE-2014-2914
Security:	CVE-2014-3219