https://bugzilla.redhat.com/show_bug.cgi?id=959641 - test
Merge pull request #1293 from andytaylor/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=959641 - test