Bug 1000167
Merge pull request #3560 from danmcp/master

Merged by openshift-bot