Merge remote-tracking branch 'origin/patch-guilherme' master
Git User [Mon, 17 Aug 2015 07:53:03 +0000 (03:53 -0400)]

Trivial merge