Merge pull request #12617 from skv-headless/master

[ci skip] second parameter of asset-url is deprecated
Conflicts:
	guides/source/asset_pipeline.md