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