v6.12.1
af4071d4 · Merge branch 'dev' · Apr 24, 2020