Merging branches/new-icons with branches/0.2