Prepare for plugin testing
Merge branch 'master' of https://github.com/dmrd/oz
Merge branch 'master' of https://github.com/dmrd/oz
Merge branch 'master' of https://github.com/dmrd/oz