v1.5.0 final commit (I hope!)