Release v6.2.1803

Notable merges