Merge remote-tracking branch 'upstream/master'

Author AssemblerManiac <amaniac-github@shredco.com>
Author date 2018-05-17 15:55:54
Author local date 2018-05-17 11:55:54 -0400
Committer AssemblerManiac <amaniac-github@shredco.com>
Committer date 2018-05-17 15:55:54
Committer local date 2018-05-17 11:55:54 -0400
Commit 2073c4dee2329da21abf0477f4cdec953db392bd
Tree bdabb495a044b3b6da97f0bea3bdbd0e47e76087
Parent c8ebd7c3e268aca9edab9f2c616688dab6229434
Parent aff465da0328c1bfbbf4e75480c117b790751e54
Merge remote-tracking branch 'upstream/master'