Sync'd branch integration/fx-team with upstream @ Wed Oct 15 15:03:45 PDT 2014