am 0c3b9112: am 883daf6e: Merge "Make gen more readable, use UNIX-style line...
am 0c3b9112: am 883daf6e: Merge "Make gen more readable, use UNIX-style line endings" into jb-mr2-dev
* commit '0c3b9112':
Make gen more readable, use UNIX-style line endings