Merge branch 'master' of https://github.com/qmk/qmk_firmware
authorJohannes Larsson <developer.johannes.larsson@gmail.com>
Wed, 24 May 2017 15:58:11 +0000 (17:58 +0200)
committerJohannes Larsson <developer.johannes.larsson@gmail.com>
Wed, 24 May 2017 15:58:11 +0000 (17:58 +0200)

Trivial merge