Merge trunk into branch "sandbox"