reintegrated master (with the 3.1.0 release) and updating version to 3.2.0-SNAPSHOT