Updated to 3.1.2.1. See the read me for a full change set.