Committing automation merge of  into trunk