From: Brendan Johan Lee <deadcyclo@vanntett.net>
Date: Tue, 10 Jan 2017 18:21:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1121753746229c06858cdebfbbaafd239d1ebc03;p=qmk_firmware.git

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

1121753746229c06858cdebfbbaafd239d1ebc03