Please take a look.
LGTM This branch lands Huw's work. The review is at: https://codereview.appspot.com/11209043/
*** Submitted: Huw's visual changes. R= CC= https://codereview.appspot.com/11209046