Imported Debian patch 0.1.4-2ubuntu0.12.04.3
Merge branch 'debian' - upgrade to latest upstream.