Remove 'px' from width modifier. bugid:112382
Bump up version number.bugid:112404
Merge branch 'release-6.0.4-1'