merge from trunk
1 file changed