ZomgPonies/Paradise — pull request #346 by VampyrBytes (2014-07-30 21:34:25+00:00)
Title: sorts out merge conflict for #343

Fixes magistrate starting loc