Merged in changes from development repository:

   Working on manual.