Changes since tag v1.2.5

commit 245a986f0cf200a5d76c462b519f8bf64ae03eff
Author: Oakshlaran <>
Date:   Wed Dec 21 19:52:40 2016 +1100

    Remove combat locking (and unused locking mode)

