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

ter a commit message to explain why this merge is necessary,