Better cacheBust support
qMerge branch 'master' of github.com:soluvas/soluvas-web