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