Sync'd branch integration/fx-team with upstream @ Thu Oct 30 08:31:52 PDT 2014