Merge remote-tracking branch 'upstream/master'
authorDaniel Casanueva <dhelta.diaz@gmail.com>
Thu, 7 Jun 2018 11:17:29 +0000 (13:17 +0200)
committerDaniel Casanueva <dhelta.diaz@gmail.com>
Thu, 7 Jun 2018 11:17:29 +0000 (13:17 +0200)

Trivial merge