6.0.0

@samccone please review