Fix path for Mac OS X.
Cleanup.
More fixes to player OSD transparency.
Merge branch 'master' into fw6-skin1