Merged in changes from development repository:

   Minor corrections.