Merge pull request #1738 from reaperhulk/deprecation-dance

Do the deprecation dance