From: Stick <nstickney@gmail.com>
Date: Tue, 28 Mar 2017 02:19:36 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a47e9166353012777b6e2d9c64f0c87420576f18;p=qmk_firmware.git

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

a47e9166353012777b6e2d9c64f0c87420576f18