Updated to the latest v3.1 commit