Revert "Revert "Merge remote-tracking branch 'obvious/master' into spec""

This reverts commit d26e6ea3d1fed80fdff3dc5f8b95dba911f08db4.