Merge remote-tracking branch 'vanir/jb42' into boom