3.19 Final

Forgot to commit.