Merge pull request #611 from fabianofranz/master

Merged by openshift-bot