Movie Template fixes
Merge pull request #56 from Cocotus/1.3.0.x

Movie Template fixes