am ba3b42ef: Merge "test - trivial whitespace change"

* commit 'ba3b42efbdf35cf5273097dad769413db1c0dc0b':
  test - trivial whitespace change