3605 Cache JavaScript files as one
Issue 3605 Merge with master
Merge pull request #1352 from sarken/issue_3605

3605 Cache JavaScript files as one