Merge "A few odds and ends." into jb-dev