Added step 2 of stuff.module (bugfix)
Added step 3 of stuff.module (bugfix)
Merge branch 'release-1.4' into develop