sync master dammit

Signed-off-by: Paul Marrington <paul@marrington.net>