IDI-104: Update VideoPlayer code to latest (immediately pre-0.1) and update plugin accordingly.
Merge branch 'IDI-104' into development