Merge pull request #1856 from dlobo/NoticeFixe