Merge trunk into branch "ofsock"