2019.w10

Raphael Defosseux

@defosseu

e1d40791 · Merge branch 'develop_integration_2019_w10' into 'develop' · Mar 13, 2019

X2; S1/noS1 clean up effort; typo fixes