Merge pull request #1698 from rzhxeo/cinemassacre