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