Sync'd branch integration/fx-team with upstream @ Mon Nov  3 14:50:48 PST 2014