Merge "Fixes honeycomb"
authorTim Rozet <trozet@redhat.com>
Thu, 18 Aug 2016 00:03:59 +0000 (00:03 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 18 Aug 2016 00:03:59 +0000 (00:03 +0000)

Trivial merge