Bug 997785
Merge pull request #3403 from danmcp/master

Merged by openshift-bot