Merge branch 'escondida-quetzal'
authorDavid Griffith <dave@661.org>
Tue, 20 Feb 2018 11:40:27 +0000 (03:40 -0800)
committerDavid Griffith <dave@661.org>
Tue, 20 Feb 2018 11:40:27 +0000 (03:40 -0800)

Trivial merge