Sync'd branch integration/fx-team with upstream @ Thu Oct  9 10:50:43 PDT 2014