syncing recent changes

Signed-off-by: Nathan Hiemstra <nathanh@criticalmass.com>