Merge branch 'change-attribute-name' into master
Merge branch 'fix-associations-module' into master