Merge branch 'release/1' into develop
[dev-vcs/gitflow] Removed untested arch
Merge branch 'release/2'