Sync'd branch integration/fx-team with upstream @ Wed Oct  1 03:25:44 PDT 2014