Deprecations sweep.
Merge pull request #187 from maksimov/2014.05

Deprecations sweep.