preliminary 3x support
Merge branch 'master' of github.com:alexzielenski/Zeppelin