Merge tag 'upstream/1.4'
authorBen Carrillo <ben@futeisha.org>
Mon, 7 Jul 2014 16:11:00 +0000 (11:11 -0500)
committerBen Carrillo <ben@futeisha.org>
Mon, 7 Jul 2014 16:11:00 +0000 (11:11 -0500)
Upstream version 1.4


Trivial merge