Merge remote-tracking branch 'upstream/master' into feature/fix_typecasting
spec for custom typecasters