Release v6.2.1712

Notable merges