Merged in changes from development repository.

Working on manual.
Updated generated files.