Merge remote-tracking branch 'upstream/jbake'