Merge branch 'maint' (with fix for CVE-2012-3386)