Bug 1024741
Merge pull request #497 from fabianofranz/master

Merged by openshift-bot