merge from trunk
final fix for default font