Merge remote-tracking branch 'upstream/master'
authoritsWill <guilhermerpmansur@gmail.com>
Mon, 28 Dec 2015 22:08:09 +0000 (23:08 +0100)
committeritsWill <guilhermerpmansur@gmail.com>
Mon, 28 Dec 2015 22:08:09 +0000 (23:08 +0100)

Trivial merge