Merge "Fix a crash." into jb-dev