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

* commit 'd544bdfac8da8aa7052aab47468acb3baf8e461a':
  Fix nice...