From: Adam YH Lee <adam.yh.lee@gmail.com>
Date: Sun, 16 Apr 2017 22:19:20 +0000 (-0700)
Subject: Merge branch 'master' into dev
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=857600aa4b3a6e46afe17b689ab7cedf7dd4688e;p=qmk_firmware.git

Merge branch 'master' into dev
---

857600aa4b3a6e46afe17b689ab7cedf7dd4688e