Merge branch 'hotfix/0.9.4'
hotfix(Build): build fiw... wooops forgot that... >_<
Merge branch 'hotfix/0.9.5' into develop