From: Brendan Johan Lee <deadcyclo@vanntett.net>
Date: Thu, 26 Jan 2017 10:56:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8a645aa9ad5ea327bf90774dd3d5cdbbf881f826;p=qmk_firmware.git

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

8a645aa9ad5ea327bf90774dd3d5cdbbf881f826