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