Core files to master
Properly pause video on stop
Merge master bug fix