2.3.1

Updated for patch 5.2