Merge pull request #183 from maksimov/2014.05

:lipstick: Deprecation clean-up strikes again