Changes since tag 7.1.0.2

commit 55e268c9f0dee5b53d6642f41b908899a25a62f7
Author: Ressy <resa1983@hotmail.com>
Date:   Sun Dec 11 15:55:08 2016 -0500

    Fix Nazak the Fiend

commit 4fa7326ff74b2d4b196d1608fa7936ebbbc50f31
Author: James D. Callahan III <jcallahan@curse.com>
Date:   Sun Dec 11 11:47:57 2016 -0600

    location => locationName - fixes several tickets.

