Merge branch 'DavidFabijan-mojvideo'