Merge branch 'feature/capistrano'