Merge "Author: Luke Hinds <lhinds@redhat.com> Date: Mon 18 Apr 11:48:27 2016 +0100"
authorMorgan Richomme <morgan.richomme@orange.com>
Mon, 18 Apr 2016 15:54:55 +0000 (15:54 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 18 Apr 2016 15:54:55 +0000 (15:54 +0000)

Trivial merge