Bug 1006085
Merge pull request #3611 from danmcp/master

Merged by openshift-bot