VP-290: Fixing failing VideoPlayerShowHide-test
Merge remote-tracking branch 'alex/VP-290'

* alex/VP-290:
  VP-290: Fixing failing VideoPlayerShowHide-test
Merge remote-tracking branch 'kernelhunter92/master'

* kernelhunter92/master:
  VP-287 (adds in missing '>')
Merge pull request #1 from fluid-project/master

refresh