I have now merged my changes with Bruno's revision 624 from the trunk
Authored by: onar3d@gmail.com 2013-04-30
Parent: [r624]
Child: [r626]