Merge tag 'upstream/0.6.3'

Upstream version 0.6.3

# gpg: Signature made Thu 08 Dec 2016 18:34:06 EET using RSA key ID 5EC1B362
# gpg: Good signature from "Marius Gavrilescu <marius@ieval.ro>"
# gpg:                 aka "Marius Gavrilescu <mgv@cpan.org>"
# gpg:                 aka "Marius Gavrilescu <gmariusx@yahoo.com>"
# gpg:                 aka "Marius Gavrilescu <marius@ceata.org>"
# gpg:                 aka "[jpeg image of size 5726]"
# gpg:                 aka "Marius Gavrilescu <marius.gavrilescu@sjc.ox.ac.uk>"
# gpg:                 aka "Marius Gavrilescu <orders@ledparts4you.uk.to>"