Bug 960291
Merge pull request #2365 from bdecoste/master

Merged by openshift-bot