Merge remote-tracking branch 'upstream/master'
authorStick <nstickney@gmail.com>
Sat, 3 Jun 2017 00:50:54 +0000 (19:50 -0500)
committerStick <nstickney@gmail.com>
Sat, 3 Jun 2017 00:50:54 +0000 (19:50 -0500)

Trivial merge