code moved around for clarity, no real changes
Authored by: Jean-Francois Dockes 2013-04-23
Parent(s): [fc4adf]
Child(ren): [45238d]