Merge branch 'master' of github.com:pydanny/cached-property