Merge tag 'upstream/3.15.0'

Upstream version 3.15.0

# gpg: Signature made sön 15 jun 2014 11:16:55 CEST using DSA key ID BDE5F1EE
# gpg: Good signature from "Andreas Henriksson <andreas@fatal.se>"
# gpg:                 aka "Andreas Henriksson <ah@debian.org>"