New 2.0.6 version.
Fixed tag.
Merge pull request #5733 from kikogo/master

New 2.0.6 version.