Sync'd branch integration/fx-team with upstream @ Mon Nov  3 13:57:47 PST 2014