Merge trunk into branch "appletalk"