Merge Develop into master, with documentation updates.