Merge pull request #591 from fabianofranz/master

Merged by openshift-bot