Set version 0.17 plus minor tidy-ups