Version bump.
Edge case where prepended URLs are not preserved during cache.
Merge branch 'refs/heads/master' into version2

Conflicts:
	system/expressionengine/third_party/minimee/config.php
Remove merge syntax.
Merge branch 'refs/heads/version2'
Merge branch 'refs/heads/version2'
Merge branch 'refs/heads/version2'
Revert "Prepend URLs for all asset types (remote & stylesheet, as well as local)."

This reverts commit a799a83b64b2f29544eee840999df188fafe0629.
Merge branch 'refs/heads/version2'
Correct prepending for remote & stylesheets.