Sync'd branch integration/fx-team with upstream @ Thu Oct  2 19:22:43 PDT 2014