More 11-ish idioms
Merge branch 'release/1.3.3'