Merge remote-tracking branch 'upstream/master'

Author AssemblerManiac <amaniac-github@shredco.com>
Author date 2018-05-16 15:52:09
Author local date 2018-05-16 11:52:09 -0400
Committer AssemblerManiac <amaniac-github@shredco.com>
Committer date 2018-05-16 15:52:09
Committer local date 2018-05-16 11:52:09 -0400
Commit 19a207bc17490170869d96a360eed24f234d2ab3
Tree 4778086732fc481040656bd203f56d18eb00a1fb
Parent 50ccb5a6b3f6c06d73209eee5faee2d33d11b220
Parent 0b801bbefbac4600ab7c389505807fe568fef276
Merge remote-tracking branch 'upstream/master'