Merge remote-tracking branch 'tgascoigne/feature/conventions_revision' into 'development'.
Merge remote-tracking branch 'tgascoigne/feature/cmake' into 'development'.
Update gitmodules