moved code around
Authored by: Jean-Francois Dockes 2013-04-22
Parent(s): [906e58]
Child(ren): [9aad81]