Merge remote-tracking branch 'alfh/bugfix_openbox_center' into next