Merge "Rebase after "Bugfix Broadcast Group"."
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 17 Apr 2016 14:44:40 +0000 (14:44 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sun, 17 Apr 2016 14:44:40 +0000 (14:44 +0000)

Trivial merge