Import upstream PR #808: commit 1#3

OpticFusion1 wants to merge 2 commits intomasterOpticFusion1/project-based-learning:masterfrom

pr-808OpticFusion1/project-based-learning:pr-808Copy head branch name to clipboard