Merge "Point tempest to stable 12.1.0"
authorMorgan Richomme <morgan.richomme@orange.com>
Tue, 23 Aug 2016 06:47:02 +0000 (06:47 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 23 Aug 2016 06:47:02 +0000 (06:47 +0000)

Trivial merge