From: lucwastiaux <luc.wastiaux@airpost.net>
Date: Sat, 10 Dec 2016 04:49:47 +0000 (+0800)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9240f27ba909aece233bda59e4ec15f7666fdece;p=qmk_firmware.git

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

9240f27ba909aece233bda59e4ec15f7666fdece