Upped to development version 0.9.17
p4#: 21821