Fix for overenthusiastic merging by @robwebset ;)
Deprecation decorator

--HG--
extra : rebase_source : 2facf4abe2d972837e0214b153e0878f899c4ebe
will_be_removed_in param, plus unit tests