Merge "Increase the maximum shell command length to 4096ish."
am: 3472410eac

* commit '3472410eac9e0c4a01b949c9e9d2ab2fe93e1acd':
  Increase the maximum shell command length to 4096ish.