Compile fix
Merge branch 'droid-destruction' of https://github.com/sabov/jedi into droid-destruction