Merge branch '8.x-2.x' of github.com:kalamuna/kalastatic_dot_module into 8.x-2.x--field-preparation-functions