Better cacheBust support
Merge branch '2.1.x'