Edited.
Merged in changes from development repository.
Minor corrections.
Updated generated files.