Merge tag 'upstream/4.2.1+repack'

Upstream version 4.2.1+repack

# gpg: Signature made Thu 28 Apr 2016 04:52:44 PM CEST using RSA key ID 7F7A36F8
# gpg: Good signature from "IOhannes m zmölnig <zmoelnig@umlaeute.mur.at>" [ultimate]
# gpg:                 aka "IOhannes m zmölnig <zmoelnig@iem.at>" [ultimate]
# gpg:                 aka "[jpeg image of size 5377]" [ultimate]
# gpg:                 aka "IOhannes m zmölnig (IEM - Network Operation Center) <noc@iem.at>" [ultimate]
# gpg:                 aka "IOhannes m zmölnig (mur.at - Verein zur Förderung von Netzwerkkunst) <zmoelnig@mur.at>" [ultimate]
# gpg:                 aka "IOhannes m zmölnig (forum::für::umläute - Network Operation Center) <noc@umlaeute.mur.at>" [ultimate]
# gpg:                 aka "Johannes Zmölnig (University of Music and Performing Arts - Graz) <johannes.zmoelnig@kug.ac.at>" [ultimate]
# gpg:                 aka "IOhannes m zmölnig (forum::für::umläute) <forum@umlaeute.mur.at>" [ultimate]
# gpg:                 aka "IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>" [ultimate]