Edition 5
Merge pull request #249 from Eric-Brison/3.2

3.2 Edition 5