Merge remote-tracking branch 'upstream/master'

Author AssemblerManiac <amaniac-github@shredco.com>
Author date 2018-05-17 13:02:36
Author local date 2018-05-17 09:02:36 -0400
Committer AssemblerManiac <amaniac-github@shredco.com>
Committer date 2018-05-17 13:02:36
Committer local date 2018-05-17 09:02:36 -0400
Commit b5be0bb3b049c5ccb0ad28e8cfc38fd94c139fbd
Tree 0ca0a029d30e9b7dc46ab968aaba03cbda163dc9
Parent 19a207bc17490170869d96a360eed24f234d2ab3
Parent d8d1503b70078d841e3342d1cc2f0ad32b9c4162
Merge remote-tracking branch 'upstream/master'