Merge remote-tracking branch 'upstream/master'
authorMario Nunes <mariogar1979@gmail.com>
Sun, 23 Aug 2015 21:24:09 +0000 (18:24 -0300)
committerMario Nunes <mariogar1979@gmail.com>
Sun, 23 Aug 2015 21:24:09 +0000 (18:24 -0300)

Trivial merge