Sync'd branch integration/fx-team with upstream @ Wed Oct  8 10:42:44 PDT 2014