Imported Upstream version 0.8.5
Merge tag 'upstream/0.8.5'

Upstream version 0.8.5

# gpg: Signature made Sun 06 Oct 2013 12:23:07 BST using RSA key ID 96CC0909
# gpg: Good signature from "Daniel Lintott <daniel@serverb.co.uk>"
# gpg:                 aka "Daniel Lintott <daniel@gns3.serverb.co.uk>"
# gpg:                 aka "Daniel Lintott <maint@gns3.serverb.co.uk>"