Merge branch 'hotfix/information-entropy-video'
Merge branch 'master' of https://github.com/alienlebarge/alienlebarge.github.com