Merge remote-tracking branch 'remotes/kraxel/tags/pull-cve-2014-8106-20141204-1'...