Merge tag 'upstream/0.2.2a'

Upstream version 0.2.2a

# gpg: Signature made Tue 19 Apr 2016 17:46:54 AEST using RSA key ID 65D1F1F7
# gpg: Good signature from "Ben Finney <[email protected]>"
# gpg:                 aka "Ben Finney (White Tree) <[email protected]>"
# gpg:                 aka "Ben Finney (Free Software Foundation) <[email protected]>"
# gpg:                 aka "Ben Finney (Debian) <[email protected]>"
# gpg:                 aka "[jpeg image of size 8917]"
# gpg:                 aka "[jpeg image of size 6222]"
# gpg:                 aka "Ben Finney <[email protected]>"
# gpg:                 aka "Ben Finney <[email protected]>"
# gpg:                 aka "Ben Finney <[email protected]>"

* tag 'upstream/0.2.2a':
  Imported Upstream version 0.2.2a