Merge tag 'upstream/0.8.1'
authorJorge Soares <j.s.soares@gmail.com>
Wed, 26 Nov 2014 11:06:35 +0000 (11:06 +0000)
committerJorge Soares <j.s.soares@gmail.com>
Wed, 26 Nov 2014 11:06:35 +0000 (11:06 +0000)
Upstream version 0.8.1


Trivial merge