Merge with release did not pick up all changes.

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/branches/develop@1427644 13f79535-47bb-0310-9956-ffa450edef68