Merge trunk into branch "objfwtest"