- Merging dev into font-awesome branch