balkian Merge branch '17-...' into 0.8.x