Merge branch 'master' into content
Revert "Merge branch 'master' into content"

This reverts commit ab733688b684764cf8cdc80b00ec9392edaf055a, reversing
changes made to 93e270db9921bf30308ab642f8e06e732bdf1963.
added  icons file
Merge branch 'content'