conflict.
Finished feature/ 37856995/hoobarf

PT-Story-URL: http://www.pivotaltracker.com/story/show/37856995
RB-Review-Request-URL: https://dev.salsitasoft.com/rb/r/4224/
Merge branch 'develop' of github.com:salsita/plugin_test into develop

Conflicts:
	a.foo