Merge branch 'for-4.9/core' into for-next
authorThierry Reding <thierry.reding@gmail.com>
Thu, 8 Sep 2016 08:59:29 +0000 (10:59 +0200)
committerThierry Reding <thierry.reding@gmail.com>
Thu, 8 Sep 2016 08:59:29 +0000 (10:59 +0200)

Trivial merge