Merge remote-tracking branch 'upstream/master'
authorLucas Pugliesi <ferreiraplucas@gmail.com>
Tue, 4 Oct 2016 17:27:00 +0000 (14:27 -0300)
committerLucas Pugliesi <ferreiraplucas@gmail.com>
Tue, 4 Oct 2016 17:27:00 +0000 (14:27 -0300)

Trivial merge