Merge branch 'master' into trunk/luizluca 217/head
authorLuiz Angelo Daros de Luca <luizluca@gmail.com>
Tue, 19 Aug 2014 04:22:51 +0000 (01:22 -0300)
committerLuiz Angelo Daros de Luca <luizluca@gmail.com>
Tue, 19 Aug 2014 04:22:51 +0000 (01:22 -0300)

Trivial merge