am 6ba4c9d9: am c78b33d0: Merge "split-select: fix OSX build" into lmp-mr1-dev automerge: be593a7

* commit '6ba4c9d91bfcd2acf3ad85db0a7945438ab4548c':
  split-select: fix OSX build