Merge remote-tracking branch 'Font-Awesome/master'