Merge pull request #1491 from headshog/fix-j2k-header