am 883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev

* commit '883daf6eed36c11a7cb458f07a88e7a9cea29c27':
  Make gen more readable, use UNIX-style line endings