Sync'd branch integration/fx-team with upstream @ Wed Oct  8 13:31:43 PDT 2014