Merge trunk into branch "gamecontroller"