Sync'd branch integration/fx-team with upstream @ Wed Sep 24 02:31:35 PDT 2014