Version 3.17.2

Merging in a Pull Request