Merge pull request #2802 from marcossffilho/develop

Calendar Updates