Sync'd branch integration/fx-team with upstream @ Wed Nov  5 09:09:54 PST 2014