Fix for issue FLEX-34320
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop