Merge tag 'upstream/1.3.0'
authorAndres Mejia <amejia004@gmail.com>
Sat, 5 May 2012 19:24:31 +0000 (15:24 -0400)
committerAndres Mejia <amejia004@gmail.com>
Sat, 5 May 2012 19:24:31 +0000 (15:24 -0400)
Upstream version 1.3.0


Trivial merge