Merge remote-tracking branch 'origin/master' into darksideofmakerlog # Conflicts: # src/components/ProjectLink.js # src/features/products/components/Product/components/ProductMedia/ProductMedia.js # src/features/users/components/PeopleCard/PeopleCard.js # src/layouts/App/App.js # src/layouts/App/routes.js # src/lib/utils/tasks.js # src/pages/AppsPage/apps/Trello/Trello.js # src/pages/DiscussionsPage/DiscussionsPage.js # src/pages/TasksPage/components/Navigation.js