Bug 1002894
Merge pull request #3599 from danmcp/master

Merged by openshift-bot