Merge branch 'release/1.5.2' into develop
Merge branch 'master' into develop
Merge branch 'hotfix/1.5.3' into develop
updating pajamas to support script tag load errors
bumping version number
Merge branch 'release/1.5.4'