Bug 949819
Merge pull request #1977 from lnader/master

Merged by openshift-bot