Push before Olof merge for smooth controls.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>