OS X icon support
Merge branch 'pr481'