Merge branch 'master' into merge-master-arno 96/1396/1
authorDan Radez <dradez@redhat.com>
Fri, 4 Sep 2015 18:38:56 +0000 (14:38 -0400)
committerDan Radez <dradez@redhat.com>
Fri, 4 Sep 2015 18:43:31 +0000 (14:43 -0400)
Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5
Signed-off-by: Dan Radez <dradez@redhat.com>

Trivial merge