Merge pull request #1222 from danmcp/master

Merged by openshift-bot