Merging branches/new-icons with trunk