Merge remote-tracking branch 'upstream/master'
authorXyverz <xyverz@gmail.com>
Tue, 21 Feb 2017 07:54:09 +0000 (23:54 -0800)
committerXyverz <xyverz@gmail.com>
Tue, 21 Feb 2017 07:54:09 +0000 (23:54 -0800)

Trivial merge