Bug 1024741
Merge pull request #496 from fabianofranz/master

Merged by openshift-bot