Finishing up for v1.3.0