Updated with cmangos public work as of 5/29/13