Merge remote-tracking branch 'bb/master' into sm-jb-mr1

Signed-off-by: Paul Beeler <sparksco@gmail.com>