Merge with auto branch
authorRafael dos Santos Silva <xfalcox@gmail.com>
Wed, 31 May 2017 16:55:06 +0000 (13:55 -0300)
committerRafael dos Santos Silva <xfalcox@gmail.com>
Wed, 31 May 2017 16:55:06 +0000 (13:55 -0300)

Trivial merge