Make VideoPlayer::playVideo block until the video finishes
Merge remote-tracking branch 'scrawl/master'