Merged in changes from development repository:

   Started working on the parser rules and functions for the `delete metadata' command.