Openbox: merge with upstream