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