Merge pull request #609 from fabianofranz/master

Merged by openshift-bot