Merge remote-tracking branch 'upstream/master'

Author AssemblerManiac <amaniac-github@shredco.com>
Author date 2018-06-25 12:12:14
Author local date 2018-06-25 08:12:14 -0400
Committer AssemblerManiac <amaniac-github@shredco.com>
Committer date 2018-06-25 12:12:14
Committer local date 2018-06-25 08:12:14 -0400
Commit 390cf323257dee8a506bdbb4800b35ed972eec3f
Tree 03015269323dfceffa0a9726728b7312bf020040
Parent eb151a26da4a51a894fe39cdba2d843531663930
Parent 575e3fc1a1f2959f728c14e6b26c6317b19beb7d
Merge remote-tracking branch 'upstream/master'