Release 0.17.0
Merge branch 'master' into bug/prevent.infinite.loops