From: Stick <nstickney@gmail.com>
Date: Wed, 7 Jun 2017 20:55:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=035f7bb1bfac1c7ca20d61bbdd31858720fde7eb;p=qmk_firmware.git

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

035f7bb1bfac1c7ca20d61bbdd31858720fde7eb