Bug 1022271
Merge pull request #4009 from danmcp/master

Merged by openshift-bot