incorporated tim-peterson/video.js master pull-request 616