From: Stick <nstickney@gmail.com>
Date: Thu, 8 Jun 2017 13:52:32 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3af2bca1fc948e17ca53809f483495d75b900310;p=qmk_firmware.git

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

3af2bca1fc948e17ca53809f483495d75b900310