Merge tag 'v0.1.24' into develop

Minor release
Merge branch 'master' of github.com:crodas/ServiceProvider into develop
Better %{dir} replacement
Evaluate configuration
bump version
Merge branch 'release/v0.1.25'