Bug 973825
Merge pull request #2834 from danmcp/master

Merged by openshift-bot