Updates against master

This commit is contained in:
Kamron Batman 2018-08-08 20:39:57 -07:00
commit 5df5b61221
No known key found for this signature in database
GPG key ID: 9F6247D24FA2AAD4
17 changed files with 41 additions and 64 deletions