Sync'd branch integration/fx-team with upstream @ Wed Oct  8 12:47:41 PDT 2014