Merge branch '2-0-stable' of https://github.com/jvalente/refinerycms-inquiries into extra_fields