Fixes Bug 895370
Merge pull request #1160 from fabianofranz/master

Merged by openshift-bot
Merge pull request #1159 from danmcp/master

Merged by openshift-bot
Merge pull request #1162 from danmcp/master

Merged by openshift-bot