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

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