No map conflict variant of PR 234 (The West has Fallen.)#241

Zero-Percent-Angel merged 2 commits intoZero-Percent-Angel:masterZero-Percent-Angel/afterglow:masterfrom

Defaulterrama:ihavenoideawhatimdoingDefaulterrama/afterglow:ihavenoideawhatimdoingCopy head branch name to clipboard