Final merging of develop into mathpets.