Commiting recent changes.  Preparing for merge.