Merge branch 'internal-hotfix-1.42'
Merge branch 'release-6.0.4'
Remove 'px' from width modifier. bugid:112382
Bump up version number. bugid:112404
Change fixed. Tag search results screen shouldn't include regular search box. bugid: 66890
Merge branch 'release-6.0.4-1'
Merge branch 'master' into develop
Merge branch 'daidai' into develop