Sync'd branch integration/fx-team with upstream @ Wed Sep 24 06:30:38 PDT 2014