Sync'd branch integration/fx-team with upstream @ Wed Oct  8 05:01:40 PDT 2014