Merge develop.
Fix the paths.
Version bump.