Forward merge branch '4.11' (PR #51)
authorRafael Weingärtner <rafaelweingartner@gmail.com>
Thu, 19 Apr 2018 19:00:39 +0000 (16:00 -0300)
committerRafael Weingärtner <rafaelweingartner@gmail.com>
Thu, 19 Apr 2018 19:00:39 +0000 (16:00 -0300)

Trivial merge