Merge commit 'abartlet/wspp-schema' into wspp-schema