Merge branch 'hotfix/1403591214'
installer: fix BuildConfig path
Merge branch 'hotfix/1403688489' into develop