Bug 1040700
Merge pull request #4469 from danmcp/master

Merged by openshift-bot