Cleaner implementaton suggested in comments to r1360 and in issue 246
Cleaner implementaton suggested in comments to r1360 and in issue 246

ldtri0209/robotframework,waldenner/robotframework,fiuba08/robotframework,fiuba08/robotframework,fiuba08/robotframework,waldenner/robotframework,waldenner/robotframework,ldtri0209/robotframework,ldtri0209/robotframework,waldenner/robotframework,ldtri0209/robotframework,fiuba08/robotframework,ldtri0209/robotframework,waldenner/robotframework,fiuba08/robotframework