Sync'd branch integration/fx-team with upstream @ Thu Oct 16 12:02:39 PDT 2014