am 7d61ec38: Merge "Replace hard tabs by spaces, and use indentation to make structure more clear"

* commit '7d61ec3833e69861f0a5440129ce6c230045a201':
  Replace hard tabs by spaces, and use indentation to make structure more clear