From: jpetermans <tibcmhhm@gmail.com>
Date: Wed, 24 May 2017 18:51:20 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into infinity60
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7;p=qmk_firmware.git

Merge remote-tracking branch 'upstream/master' into infinity60
---

2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7