css cache busting filter
Merge remote-tracking branch 'origin/pull/626/head'
tweaks and cleanups for previous merge