Merge "Fix NPE" into jb-ub-now-indigo-rose
tree: b104cf5f603dfbb176cd97d47f771e0be3d759c6
  1. src/