Merge pull request #78 from adietish/2.4.x

Merged by openshift-bot