Bug 1007085
Merge pull request #3626 from danmcp/master

Merged by openshift-bot