Merge tag 'upstream/1.4.0'

Upstream version 1.4.0

# gpg: Signature made Fri 31 May 2013 09:17:33 PM CEST using DSA key ID B616FFFA
# gpg: Good signature from "Jonas Genannt <jonas@brachium-system.net>"
# gpg:                 aka "Jonas Genannt <jonas.genannt@capi2name.de>"
# gpg:                 aka "Jonas Genannt <jonasge@gmx.net>"

* tag 'upstream/1.4.0':
  Imported Upstream version 1.4.0