Merge branch 'patch-14' into patch-26

This commit is contained in:
asddsaz 2019-05-07 21:55:05 -07:00 committed by GitHub
commit 6f88054253
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23