Imported Upstream version 0~140629
Merge tag 'upstream/0_140629'

Upstream version 0~140629

# gpg: Signature made Sun 29 Jun 2014 02:11:43 PM UTC using RSA key ID 933B4AF4
# gpg: Good signature from "Gerik Bonaert <dev@adaxisoft.be>"
Update changelog
Update changelog
Imported Upstream version 0~140831
Merge tag 'upstream/0_140831'

Upstream version 0~140831

# gpg: Signature made Sun 31 Aug 2014 12:26:42 PM UTC using RSA key ID 933B4AF4
# gpg: Good signature from "Gerik Bonaert <dev@adaxisoft.be>"
Update changelog
Update changelog