Merge tag 'upstream/0.5.1'

Upstream version 0.5.1

# gpg: Signature made Sun 11 May 2014 10:26:47 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>"