concluded the merge of branch 1.15 and trunk.
paul