Imported Upstream version 2014e
Imported Debian patch 2014e-0ubuntu0.12.04