Merge branch 'master' of github.com:billzorn/sfpy
authorBill Zorn <bill.zorn@gmail.com>
Thu, 2 Aug 2018 22:56:08 +0000 (15:56 -0700)
committerBill Zorn <bill.zorn@gmail.com>
Thu, 2 Aug 2018 22:56:08 +0000 (15:56 -0700)

Trivial merge