Merge branch 'jwplayer-6'
Documentation
Merge branch 'master' into jwplayer-6