Merge tag 'upstream/0.8.1'
authorJorge Soares <j.s.soares@gmail.com>
Fri, 28 Nov 2014 09:29:24 +0000 (09:29 +0000)
committerJorge Soares <j.s.soares@gmail.com>
Fri, 28 Nov 2014 09:29:24 +0000 (09:29 +0000)
Upstream version 0.8.1


Trivial merge