Merge tag 'upstream/2.72+dfsg1'

Upstream version 2.72+dfsg1

# gpg: Signature made Tue Oct  7 17:17:26 2014 CEST
# gpg:                using RSA key 0xA50635BCBF02576C
# gpg: Good signature from "Matteo F. Vescovi <mfvescovi@gmail.com>" [ultimate]
# Primary key fingerprint: 4E8E 810A 6B44 5FDE 68DA  D025 8062 3989 83B2 CF7A
#      Subkey fingerprint: F586 7FC3 4CA5 8DD9 E563  B61E A506 35BC BF02 576C