Feature: merge 4.x branch into develop#22

lindyhopchris merged 5 commits intodeveloplaravel-json-api/core:developfrom

merge-4.xlaravel-json-api/core:merge-4.xCopy head branch name to clipboard