merge w. giulio (master)

keep this uncommented to ensure compilation on gcc 4.6