Merge "minor bug fixes"
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 7 Jul 2016 09:33:59 +0000 (09:33 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 7 Jul 2016 09:33:59 +0000 (09:33 +0000)

Trivial merge