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

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

fa96d64f3761e6cd0661c63a3fc257b58c669be0