Apply Leandro's patch for startOnFirstThread bug (MOJO-1559)
Merge pull request #1 from jlalande/master

Fix MOJO-1559