Sync'd branch integration/fx-team with upstream @ Wed Oct  8 11:22:46 PDT 2014