Merge remote-tracking branch 'upstream/master'

Author AssemblerManiac <amaniac-github@shredco.com>
Author date 2018-06-14 12:29:10
Author local date 2018-06-14 08:29:10 -0400
Committer AssemblerManiac <amaniac-github@shredco.com>
Committer date 2018-06-14 12:29:10
Committer local date 2018-06-14 08:29:10 -0400
Commit eb151a26da4a51a894fe39cdba2d843531663930
Tree e17176f8af6f9a3ef0a129a6b660e43de2061021
Parent 81c7131869e3efcc2005e26ab268fd281d1d1fbf
Parent 7a169e41c3af72474208e573bfcbed90db5edb97
Merge remote-tracking branch 'upstream/master'