Bug 947288
Merge pull request #1880 from lnader/master

Merged by openshift-bot