Sync'd branch integration/fx-team with upstream @ Thu Oct 16 19:32:37 PDT 2014