Merge branch 'hotfix/noJQueryDeferreds'
Merge branch 'hotfix/windowsPathError' into develop