fossfreedom Merge pull request #413 from welltoncosta/release-2.1-2