Fix paths to local gems
Merge branch 'develop'