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.