Merge pull request #1393 from danmcp/master

Merged by openshift-bot