Fix typo
Merge branch 'master' into topic/shapeless-2.1