Needed to resolve bug 693226. 1.17 has been in tree since Jun 20. Okay to stabilize?
(Also a nice improvement in 1.17 is that it doesn't require python:2)
Please Cc arches.
Let's give it a try.