From: Stick <nstickney@gmail.com>
Date: Fri, 23 Jun 2017 21:02:44 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f4e4d6f8d046eff9a4d49ddbf6e499ba519c7182;p=qmk_firmware.git

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

f4e4d6f8d046eff9a4d49ddbf6e499ba519c7182