Merge changes from topic "parallel"
[transportpce.git] / .gitmodules