Conflicting change.
Merge branch 'develop' of github.com:salsita/plugin_test into develop

Conflicts:
	a.foo