Pushed to upstream

cc/ @hhuijser.  SourceFormatter test did not catch this