am 54655eaf: Merge "Fix nice..."

* commit '54655eaf92ca91bfe2fa293896059a181e27b6eb':
  Fix nice...