am 26646340: Rollo tweaks.

Merge commit '26646340d861a4c182e741be1ec677040dc7e979'

* commit '26646340d861a4c182e741be1ec677040dc7e979':
  Rollo tweaks.