Merge pull request #421 from danmcp/master

Merged by openshift-bot