From: Seth Chandler <sethbc@sethbc.org>
Date: Sat, 19 Nov 2016 16:20:41 +0000 (-0500)
Subject: merge upstream/master
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ac7d202d4f143b19719b13c28177cee500896bca;p=qmk_firmware.git

merge upstream/master
---

ac7d202d4f143b19719b13c28177cee500896bca