Sync'd branch integration/fx-team with upstream @ Wed Nov  5 16:19:48 PST 2014