Merge remote-tracking branch 'wesen/bug/bkp'

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>