From: Stick <nstickney@gmail.com>
Date: Mon, 3 Apr 2017 21:59:27 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bee9183e7fae7c739b9c42dd4dc759783ac80e46;p=qmk_firmware.git

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

bee9183e7fae7c739b9c42dd4dc759783ac80e46