Sync'd branch integration/fx-team with upstream @ Thu Sep 18 10:02:38 PDT 2014