Merge in 1.3.1 API changes