Merge pull request #1225 from danmcp/master

Merged by openshift-bot