From: Jack Humbert <jack.humb@gmail.com>
Date: Wed, 22 Feb 2017 04:34:23 +0000 (-0500)
Subject: Merge pull request #1115 from Skrymir/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=da41cd1adf42c9c955090f59139685ec6f67ed34;p=qmk_firmware.git

Merge pull request #1115 from Skrymir/master

Update from upstream
---

da41cd1adf42c9c955090f59139685ec6f67ed34