Insert Band-Aid here.
Merge remote-tracking branch 'ls/jb3'; commit 'HEAD' into HEAD