Show must go on
Merge branch 'master' of https://github.com/uavn/oplayer3