Merge tag 'upstream/1.4.2'

Upstream version 1.4.2

# gpg: Signature made Thu 21 Aug 2014 07:57:21 AM CEST using DSA key ID 8A2FAFBC
# gpg: Good signature from "Matthijs Kooijman <matthijs@stdin.nl>"
# gpg:                 aka "Matthijs Kooijman - Brevidius <matthijs@brevidius.nl>"
# gpg:                 aka "Matthijs Kooijman IT <matthijs@mkit.nl>"
# gpg:                 aka "Matthijs Kooijman - FON <matthijs.kooijman@fon.com>"