daily merge of svn trunk into branch