Merge "fixes for congress"
authorTim Rozet <trozet@redhat.com>
Wed, 20 Jul 2016 21:34:51 +0000 (21:34 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 20 Jul 2016 21:34:51 +0000 (21:34 +0000)

Trivial merge