Merge tag 'upstream/4.2.4_repack'

Merge tag 'upstream/4.2.4_repack'

Upstream version 4.2.4~repack

# gpg: Signature made Wed 21 Sep 2016 08:42:50 AM CEST
# gpg:                using RSA key B65019C47F7A36F8
# gpg: Good signature from "IOhannes m zmölnig <zmoelnig@umlaeute.mur.at>" [unknown]
# gpg:                 aka "IOhannes m zmölnig <zmoelnig@iem.at>" [unknown]
# gpg:                 aka "[jpeg image of size 5377]" [unknown]
# gpg:                 aka "IOhannes m zmölnig (IEM - Network Operation Center) <noc@iem.at>" [unknown]
# gpg:                 aka "IOhannes m zmölnig (mur.at - Verein zur Förderung von Netzwerkkunst) <zmoelnig@mur.at>" [unknown]
# gpg:                 aka "IOhannes m zmölnig (forum::für::umläute - Network Operation Center) <noc@umlaeute.mur.at>" [unknown]
# gpg:                 aka "Johannes Zmölnig (University of Music and Performing Arts - Graz) <johannes.zmoelnig@kug.ac.at>" [unknown]
# gpg:                 aka "IOhannes m zmölnig (forum::für::umläute) <forum@umlaeute.mur.at>" [unknown]
# gpg:                 aka "IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7405 E745 5748 0973 4800  156D B650 19C4 7F7A 36F8