Test master mod
Merge branch 'master' of https://github.com/rwestergren/plugin_test