Merge branch 'master' of github.com:billzorn/sfpy
authorBill Zorn <bill.zorn@gmail.com>
Wed, 25 Jul 2018 20:59:34 +0000 (13:59 -0700)
committerBill Zorn <bill.zorn@gmail.com>
Wed, 25 Jul 2018 20:59:34 +0000 (13:59 -0700)
oops forgot to rebase


Trivial merge