Minor cosmetics
Merge commit '1954c2661a6097ac151f6c6958b1ee03ca44ed02' into HEAD