bug 5959: https://github.com/ansible/ansible/issues/5959
Merge pull request #6400 from vadimkuznetsov/bug5959

bug 5959: https://github.com/ansible/ansible/issues/5959