Merge tag 'upstream/11.6' into jessie
Upstream version 11.6
# gpg: Signature made Tue 01 Mar 2016 23:09:35 CET using RSA key ID 6EA71993
# gpg: please do a --check-trustdb
# gpg: Good signature from "Sebastian Ramacher <sebastian@ramacher.at>"
# gpg: aka "Sebastian Ramacher <s.ramacher@gmail.com>"
# gpg: aka "Sebastian Ramacher <s.ramacher@gmx.at>"
# gpg: aka "Sebastian Ramacher <s.ramacher@student.tugraz.at>"
# gpg: aka "Sebastian Ramacher <sramacher@debian.org>"
# gpg: aka "Sebastian Ramacher <sebastian.ramacher@iaik.tugraz.at>"