merge w. giulio (master)

put scale before translate to ensure backwards compatibility