Release v6.2.1801

Notable merges