v1.6.1
5f355f73 · Merge branch '161-prep' into 'v1.6-stable' ·