Merge remote-tracking branch 'upstream/master'
authorglake1 <glake1@gmail.com>
Fri, 14 Apr 2017 20:27:07 +0000 (13:27 -0700)
committerglake1 <glake1@gmail.com>
Fri, 14 Apr 2017 20:27:07 +0000 (13:27 -0700)

Trivial merge