v6.12.0
94010b4a · Merge branch 'dev' · Apr 19, 2020