Bug 977037
Merge pull request #2923 from lnader/master

Merged by openshift-bot