Merge branch master, module version update
Update version module 1.3.0-dev
Merge remote-tracking branch 'origin/develop' into qa