Sync merge

Signed-off-by: Winguse <github@winguse.com>