Merge remote-tracking branch 'origin/develop' into as3httpclient-work Conflicts: installer/src/InstallApacheFlex.mxml