Sync'd branch integration/fx-team with upstream @ Fri Nov  7 14:05:54 PST 2014