silence compiler warning
merge trunk