Remove &nbsp; element since it was baddly displayed.
Merge origin/master