Merge bjlittle repo changes.