Fix for CVE-2013-0156.
Merge branch 'master' into configuration-in-database