Merging changes from rel-1-2 to trunk