Version 1.1
Merge branch 'master' into wc_cop-1.1