manual merge

Author AssemblerManiac <amaniac-github@shredco.com>
Author date 2018-04-17 17:53:15
Author local date 2018-04-17 13:53:15 -0400
Committer AssemblerManiac <amaniac-github@shredco.com>
Committer date 2018-04-17 17:53:15
Committer local date 2018-04-17 13:53:15 -0400
Commit 2982a6c4c8d784416cf16b716c97e2578b54bbd2
Tree cfbfb5fcbae1608a9d58f37ce0e7ae104986f90b
Parent 25627c1042c71f90a7cdcd662092f115e6ededf1
Parent 33ec3a4bff345c1748bc54c3f525c6ddc2dd01b5
manual merge