Fix for #1674
Merge branch '2.x' of https://github.com/pods-framework/pods into 2.x