Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2015-5225-20150826-1'...