- Merging fix in for atouplay in Safari fron development to font-awesome branch