Merge remote-tracking branch 'origin/master' into patch-guilherme patch-guilherme
Git User [Mon, 20 Jul 2015 06:50:52 +0000 (02:50 -0400)]

Trivial merge