Merge tag 'upstream/3.7.2'

Upstream version 3.7.2

# gpg: Signature made Fri 24 Oct 2014 01:27:51 PM CEST
# gpg:                using DSA key 0x40E354D9FA26E2EE
# gpg: Good signature from "Stig Sandbeck Mathisen <ssm@fnord.no>" [ultimate]
# gpg:                 aka "Stig Sandbeck Mathisen <ssm@debian.org>" [ultimate]
# gpg:                 aka "Stig Sandbeck Mathisen <stigsm@gmail.com>" [ultimate]
# gpg:                 aka "Stig Sandbeck Mathisen <ssm@linpro.no>" [ultimate]
# gpg:                 aka "Stig Sandbeck Mathisen <ssm@online.no>" [ultimate]
# gpg:                 aka "Stig Sandbeck Mathisen <ssm@redpill-linpro.com>" [ultimate]