Merge branch 'fix-and-within-or-warning' into 'master'

C expression to code mapper: Parenthesize '&&' within '||' to avoid warnings from clang-based compilers.

See e.g.: https://gist.github.com/mattwala/734395f2f887013571c8de2a54cda8d0

See merge request !41