fixing the code to avoid failing tests
Authored by: kaddoura 2015-07-09
Parent: [r33839]
Child: [r33841]
