Merge branch 'for-4.13/core' into for-next
authorThierry Reding <thierry.reding@gmail.com>
Thu, 6 Jul 2017 15:16:45 +0000 (17:16 +0200)
committerThierry Reding <thierry.reding@gmail.com>
Thu, 6 Jul 2017 15:16:45 +0000 (17:16 +0200)

Trivial merge