Fix [34538ba43f]
Fix [34538ba43f]
merge trunk