Merge branch 'master' into 'feature/add-sentry' # Conflicts: # src/main/index.js # src/renderer/components/WelcomePage.vue # src/renderer/components/history.vue