Merge remote-tracking branch 'upstream/master'
authoritsWill <guilhermerpmansur@gmail.com>
Tue, 3 May 2016 16:31:48 +0000 (12:31 -0400)
committeritsWill <guilhermerpmansur@gmail.com>
Tue, 3 May 2016 16:31:48 +0000 (12:31 -0400)

Trivial merge