Committing before integrating Bruno's last changes from the main branch
Authored by: onar3d@gmail.com 2013-04-30
Parent: [r623]
Child: [r625]