Sync'd branch integration/fx-team with upstream @ Fri Nov  7 10:51:48 PST 2014