Update from upstream#21

syntaxerror247 merged 2 commits intomainsyntaxerror247/VectorTouch:mainfrom

upstream-syncsyntaxerror247/VectorTouch:upstream-syncCopy head branch name to clipboard