Merged in changes from development repository:

   Updating to account for recent changes (pull procedure).
Updated generated files.