Imported Upstream version 20131125
Imported Debian patch 20131125-1