Added sonar branch to distinguish this branch from the trunk.
Authored by: keess 2016-03-14
Parent: [r2848]
Child: [r2850]