Bundle: Unify bundling concepts. (#950)
CSS: Query-string-less file path for embed image.
Image: Improves URI condition. (#971 & #999)
* Rescues from exception for #971.
* Fixes CA warning.
Merge pull request #995 from am11/master

 Miscellaneous Fixes (#950, #971 & #999)