Merge branch 'apache-tour-de-flex-1.2'

Conflicts:
	installer/src/InstallApacheFlex.mxml