Merge tag 'upstream/0.10.2'

Upstream version 0.10.2

# gpg: Signature made Wed 01 Jul 2015 10:52:40 AM EDT using RSA key ID 037E24F2
# gpg: Good signature from "Scott Howard <showard@debian.org>"
# gpg:                 aka "Scott Howard <showard314@gmail.com>"
# gpg:                 aka "Scott Howard <showard314@ubuntu.com>"
# gpg:                 aka "Scott Howard <showard@sk1m.dydns.org>"