Sync'd branch integration/fx-team with upstream @ Mon Oct  6 03:42:40 PDT 2014