Fix width.
Fix expected message.
Merge topic 'cxx11-features' into next

87fdaf9d Fix expected message.
dc952daf Fix width.